From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 28 Oct 2015 11:10:30 +0000 (-0400)
Subject: shortcuts label: Redo the keycap theming
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~5096
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=62ec4a2415bc463c6b07dbcbf4baa1770f14019f;p=gtk%2B3.0.git

shortcuts label: Redo the keycap theming

Use a style class directly on the frame. This is easier to reuse.
---

diff --git a/gtk/gtkshortcutlabel.c b/gtk/gtkshortcutlabel.c
index 907761c88b..12f14678b7 100644
--- a/gtk/gtkshortcutlabel.c
+++ b/gtk/gtkshortcutlabel.c
@@ -175,6 +175,7 @@ display_shortcut (GtkContainer    *self,
         gtk_container_add (self, dim_label ("+"));
 
       frame = gtk_frame_new (NULL);
+      gtk_style_context_add_class (gtk_widget_get_style_context (frame), "keycap");
       gtk_widget_show (frame);
 
       gtk_container_add (self, frame);
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index a39e8fa94b..45916e67eb 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3447,7 +3447,7 @@ shortcutswindow .round .button label {
   padding: 0;
 }
 
-shortcutswindow GtkShortcutLabel .frame {
+.frame.keycap {
   background-color: #fefefe;
   border: 1px solid #cecece;
   border-radius: 5px;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 0ef4bd0042..89e913daae 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4660,7 +4660,7 @@ shortcutswindow .round .titlebar .button.titlebutton label,
 .titlebar shortcutswindow .round .button.titlebutton label {
   padding: 0; }
 
-shortcutswindow GtkShortcutLabel .frame {
+.frame.keycap {
   background-color: #fefefe;
   border: 1px solid #cecece;
   border-radius: 5px;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 1fcd53b9b8..c47800718f 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4833,7 +4833,7 @@ shortcutswindow .round .titlebar .button.titlebutton label,
 .titlebar shortcutswindow .round .button.titlebutton label {
   padding: 0; }
 
-shortcutswindow GtkShortcutLabel .frame {
+.frame.keycap {
   background-color: #fefefe;
   border: 1px solid #cecece;
   border-radius: 5px;